Merge "Make SpecialContributionsBeforeMainOutput hook more useful"